Merge.
authorSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 11:44:47 +0000 (11:44 +0000)
committerSteven Smith <ssmith@xensource.com>
Tue, 31 Oct 2006 11:44:47 +0000 (11:44 +0000)
commit69ff2305bba8c9348991bf417e15e18be3d52ca3
tree7aa8c6d1b9e25ea776655ae815ad0a7b6b14574b
parent80cc85d4374d4cebc6aad26a717b6674eb5f34ac
parent98f201b0e52492cf8e29ec7c0521b76fd5fb0128
Merge.